Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 17:02:07 +0000 (10:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 17:02:07 +0000 (10:02 -0700)

Trivial merge